Add an option to bootstrap from a local cargo

diff --git a/Makefile.in b/Makefile.in
index a94db80d2e5e213a010d65384d72bd8749d250fb..359f09a08bac8ccc0ccbffba1ed95cdb19164e84 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -58,7 +58,11 @@ BIN_TARGETS_$(1) := $$(BIN_TARGETS:%=$$(TARGET_$(1))/%$$(X))
 endef
 $(foreach target,$(CFG_TARGET),$(eval $(call DIST_TARGET,$(target))))
 
+ifdef CFG_LOCAL_CARGO
+CARGO := $(CFG_LOCAL_CARGO)
+else
 CARGO := $(TARGET_ROOT)/snapshot/bin/cargo$(X)
+endif
 
 all: $(foreach target,$(CFG_TARGET),cargo-$(target))
 
@@ -72,7 +76,7 @@ test-unit-$(1): $$(CARGO)
 endef
 $(foreach target,$(CFG_TARGET),$(eval $(call CARGO_TARGET,$(target))))
 
-$(CARGO): src/snapshots.txt
+$(TARGET_ROOT)/snapshot/bin/cargo$(X): src/snapshots.txt
        $(CFG_PYTHON) src/etc/dl-snapshot.py $(CFG_BUILD)
        touch $@
 

diff --git a/configure b/configure
index e1da3a7f574aaca1435dbb88af3abcee0a8b4dc2..255b51bfc34f5db3f2f83275bdf1ee1b50766ff1 100755 (executable)
--- a/configure
+++ b/configure
@@ -326,6 +326,7 @@ valopt datadir "${CFG_PREFIX}/share" "install data"
 valopt infodir "${CFG_PREFIX}/share/info" "install additional info"
 valopt mandir "${CFG_PREFIX}/share/man" "install man pages in PATH"
 valopt libdir "${CFG_PREFIX}/lib" "install libraries"
+valopt local-cargo "" "local cargo to bootstrap from"
 
 if [ $HELP -eq 1 ]
 then